-Fix using simple type names on Silverlight
This commit is contained in:
@@ -57,11 +57,16 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
private static string GetSimpleTypeName(Type type)
|
private static string GetSimpleTypeName(Type type)
|
||||||
{
|
{
|
||||||
|
#if !SILVERLIGHT
|
||||||
string fullyQualifiedTypeName = type.FullName + ", " + type.Assembly.GetName().Name;
|
string fullyQualifiedTypeName = type.FullName + ", " + type.Assembly.GetName().Name;
|
||||||
|
|
||||||
// for type names with no nested type names then return
|
// for type names with no nested type names then return
|
||||||
if (!type.IsGenericType || type.IsGenericTypeDefinition)
|
if (!type.IsGenericType || type.IsGenericTypeDefinition)
|
||||||
return fullyQualifiedTypeName;
|
return fullyQualifiedTypeName;
|
||||||
|
#else
|
||||||
|
// Assembly.GetName() is marked SecurityCritical
|
||||||
|
string fullyQualifiedTypeName = type.AssemblyQualifiedName;
|
||||||
|
#endif
|
||||||
|
|
||||||
StringBuilder builder = new StringBuilder();
|
StringBuilder builder = new StringBuilder();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user