-Fixed time zone unit test failure

-Removed Metro IDictionary copy
-Fixed Metro build
This commit is contained in:
James Newton-King
2012-06-08 05:21:58 -07:00
parent 0ba52bbf13
commit 55854f1682
67 changed files with 258 additions and 360 deletions
@@ -102,10 +102,8 @@ namespace Newtonsoft.Json.Utilities
{
ValidationUtils.ArgumentNotNull(type, "type");
#if !NETFX_CORE
if (typeof(IDictionary).IsAssignableFrom(type))
return true;
#endif
if (ReflectionUtils.ImplementsGenericDefinition(type, typeof (IDictionary<,>)))
return true;
@@ -159,12 +157,10 @@ namespace Newtonsoft.Json.Utilities
return (IWrappedDictionary)ReflectionUtils.CreateGeneric(typeof(DictionaryWrapper<,>), new[] { dictionaryKeyType, dictionaryValueType }, instanceCreator, dictionary);
}
#if !NETFX_CORE
else if (dictionary is IDictionary)
{
return new DictionaryWrapper<object, object>((IDictionary)dictionary);
}
#endif
else
{
throw new ArgumentException("Can not create DictionaryWrapper for type {0}.".FormatWith(CultureInfo.InvariantCulture, dictionary.GetType()), "dictionary");