-Added support for deserializing Version from string
This commit is contained in:
@@ -454,31 +454,43 @@ namespace Newtonsoft.Json.Utilities
|
||||
return ConvertResult.Success;
|
||||
}
|
||||
|
||||
if (initialValue is string)
|
||||
string s = initialValue as string;
|
||||
if (s != null)
|
||||
{
|
||||
if (targetType == typeof(Guid))
|
||||
{
|
||||
value = new Guid((string)initialValue);
|
||||
value = new Guid(s);
|
||||
return ConvertResult.Success;
|
||||
}
|
||||
if (targetType == typeof(Uri))
|
||||
{
|
||||
value = new Uri((string)initialValue, UriKind.RelativeOrAbsolute);
|
||||
value = new Uri(s, UriKind.RelativeOrAbsolute);
|
||||
return ConvertResult.Success;
|
||||
}
|
||||
if (targetType == typeof(TimeSpan))
|
||||
{
|
||||
value = ParseTimeSpan((string)initialValue);
|
||||
value = ParseTimeSpan(s);
|
||||
return ConvertResult.Success;
|
||||
}
|
||||
if (targetType == typeof(byte[]))
|
||||
{
|
||||
value = System.Convert.FromBase64String((string)initialValue);
|
||||
value = System.Convert.FromBase64String(s);
|
||||
return ConvertResult.Success;
|
||||
}
|
||||
if (targetType == typeof(Version))
|
||||
{
|
||||
Version result;
|
||||
if (VersionTryParse(s, out result))
|
||||
{
|
||||
value = result;
|
||||
return ConvertResult.Success;
|
||||
}
|
||||
value = null;
|
||||
return ConvertResult.NoValidConversion;
|
||||
}
|
||||
if (typeof(Type).IsAssignableFrom(targetType))
|
||||
{
|
||||
value = Type.GetType((string)initialValue, true);
|
||||
value = Type.GetType(s, true);
|
||||
return ConvertResult.Success;
|
||||
}
|
||||
}
|
||||
@@ -626,6 +638,25 @@ namespace Newtonsoft.Json.Utilities
|
||||
}
|
||||
#endif
|
||||
|
||||
public static bool VersionTryParse(string input, out Version result)
|
||||
{
|
||||
#if !(NET20 || NET35)
|
||||
return Version.TryParse(input, out result);
|
||||
#else
|
||||
// improve failure performance with regex?
|
||||
try
|
||||
{
|
||||
result = new Version(input);
|
||||
return true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
result = null;
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
public static bool IsInteger(object value)
|
||||
{
|
||||
switch (GetTypeCode(value.GetType()))
|
||||
|
||||
Reference in New Issue
Block a user